deprecate gtk_type_init() unconditionally (also for GTK_COMPILATION). Move

2008-06-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktypeutils.h: deprecate gtk_type_init() unconditionally
	(also for GTK_COMPILATION). Move some deprecated typedefs around
	to reduce the mess with zillions of deprecated sections.

	* gtk/gtkmain.c (do_post_parse_initialization): replace the call
	to gtk_type_init() by g_type_init() and gtk_object_get_type() even
	though the latter is probably completely pointless.

svn path=/trunk/; revision=20684

diff --git a/ChangeLog b/ChangeLog
index 7ab658a030347258b6febef7246df67d503a0ed6..fa9cabbac82e1848342150b7f9f59f295577770f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-24  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktypeutils.h: deprecate gtk_type_init() unconditionally
+       (also for GTK_COMPILATION). Move some deprecated typedefs around
+       to reduce the mess with zillions of deprecated sections.
+
+       * gtk/gtkmain.c (do_post_parse_initialization): replace the call
+       to gtk_type_init() by g_type_init() and gtk_object_get_type() even
+       though the latter is probably completely pointless.
+
 2008-06-24  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkdialog.c (gtk_dialog_init): also revert change in how

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b7edf39e2434c3bfc360d0d698a7994f8190a354..47207d3a2059aafcdbf6d44a2d7312c2687fc1f9 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -682,8 +682,11 @@ do_post_parse_initialization (int    *argc,
       g_warning ("Whoever translated default:LTR did so wrongly.\n");
   }
 
-  gtk_type_init (0);
- _gtk_accel_map_init ();  
+  /* do what the call to gtk_type_init() used to do */
+  g_type_init ();
+  gtk_object_get_type ();
+
+  _gtk_accel_map_init ();
   _gtk_rc_init ();
 
   /* Set the 'initialized' flag.

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 03350713178e781324e73552433110d4cc2dee0a..c3d9cf55d0ab01d386be71f803dec370e58e0a6b 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -120,13 +120,6 @@ typedef void (*GtkCallbackMarshal)  (GtkObject    *object,
                                     guint         n_args,
                                     GtkArg       *args);
 
-#ifndef GTK_DISABLE_DEPRECATED
-
-typedef void (*GtkDestroyNotify)    (gpointer      data);
-typedef void (*GtkSignalFunc)       (void);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
 /* This used to be defined in gtkitemfactory.h, but moved over here after
  * the complete deprecation of that header
  */
@@ -135,6 +128,9 @@ typedef gchar * (*GtkTranslateFunc) (const gchar  *path,
 
 #ifndef GTK_DISABLE_DEPRECATED
 
+typedef void (*GtkDestroyNotify)    (gpointer      data);
+typedef void (*GtkSignalFunc)       (void);
+
 #define GTK_SIGNAL_FUNC(f)         G_CALLBACK(f)
 
 typedef struct _GtkTypeInfo         GtkTypeInfo;
@@ -241,6 +237,7 @@ struct _GtkTypeInfo
   GtkClassInitFunc      base_class_init_func;
 };
 
+void            gtk_type_init   (GTypeDebugFlags    debug_flags);
 GtkType         gtk_type_unique (GtkType            parent_type,
                                  const GtkTypeInfo *gtkinfo);
 gpointer        gtk_type_class  (GtkType            type);
@@ -266,11 +263,6 @@ GtkFlagValue*      gtk_type_flags_find_value       (GtkType         flags_type,
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* deprecated, use g_type_init() instead */
-void           gtk_type_init   (GTypeDebugFlags debug_flags);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
 G_END_DECLS
 
 #endif /* __GTK_TYPE_UTILS_H__ */